From: Kenichi Handa Date: Tue, 18 Jun 2013 14:45:08 +0000 (+0900) Subject: font.c (Ffont_spec): Signal an error for an invalid font name. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3605^2~74 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3c542890fe6fb88ecdca7e38c9f85e7360980110;p=emacs.git font.c (Ffont_spec): Signal an error for an invalid font name. --- diff --git a/src/ChangeLog b/src/ChangeLog index fc57bdaba26..9ce8dce3604 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-06-18 Kenichi Handa + + * font.c (Ffont_spec): Signal an error for an invalid font name. + 2013-06-17 Paul Eggert Move functions from lisp.h to individual modules when possible. diff --git a/src/font.c b/src/font.c index 7bd44a5e52f..231df2ef71a 100644 --- a/src/font.c +++ b/src/font.c @@ -3863,7 +3863,8 @@ usage: (font-spec ARGS...) */) if (EQ (key, QCname)) { CHECK_STRING (val); - font_parse_name (SSDATA (val), SBYTES (val), spec); + if (font_parse_name (SSDATA (val), SBYTES (val), spec) < 0) + error ("Invalid font name: %s", SSDATA (val)); font_put_extra (spec, key, val); } else